(server-start): Try both possible socket file names for the file to delete.

diff --git a/lisp/server.el b/lisp/server.el
index 29a9d24c3ad69ed354a1f94d1cd5595c5bf4bc4c..5b0f88a09f704baaf195961d08d4d406aeaec37b 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -147,6 +147,9 @@ Prefix arg means just kill any existing server communications subprocess."
        (set-process-sentinel server-process nil)
        (condition-case () (delete-process server-process) (error nil))))
   (condition-case () (delete-file "~/.emacs_server") (error nil))
+  (condition-case ()
+      (delete-file (format "/tmp/esrv%d-%s" (user-uid) (system-name)))
+    (error nil))
   ;; If we already had a server, clear out associated status.
   (while server-clients
     (let ((buffer (nth 1 (car server-clients))))